projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83e1226 3df6564)
bitkeeper revision 1.1197 (420fb93dC1WSuJegG_k9TUwX4eFmyw)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Sun, 13 Feb 2005 20:31:57 +0000 (20:31 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Sun, 13 Feb 2005 20:31:57 +0000 (20:31 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

1  2 
xen/arch/x86/mm.c patch | diff1 | diff2 | blob | history
xen/arch/x86/shadow.c patch | diff1 | diff2 | blob | history
xen/include/asm-x86/shadow.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/mm.c
Simple merge
diff --cc xen/arch/x86/shadow.c
Simple merge
diff --cc xen/include/asm-x86/shadow.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.